(facemenu-add-new-face): Defend against symbol that isn't a face name.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index eaaf4dacd720c06e0e3297e28d55446fb579d22c..13cf7fbd73410599b9aa314d42e141b02bfcbd12 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -690,6 +690,9 @@ This is called whenever you create a new face, and at other times."
     (cond ((facemenu-iterate ; check if equivalent face is already in the menu
            (lambda (m) (and (listp m)
                             (symbolp (car m))
+                            ;; Avoid error in face-equal
+                            ;; when a non-face is erroneously present.
+                            (facep (car m))
                             (face-equal (car m) symbol)))
            (cdr (symbol-function menu))))
          ;; Faces with a keyboard equivalent.  These go at the front.